Statemine state migration runtime changes. by cheme · Pull Request #1743 · paritytech/cumulus

cheme · 2022-10-07T14:23:56Z

This PR contains runtime change to switch state mine to a hybrid trie state, as needed for https://github.com/paritytech/devops/issues/1508.
Note that the accounts need to be change to the rights KEY_ROOT_MIG_CONTROLLER and KEY_MIG_CONTROLLER that will be responsible for the migration. CC @PierreBesson

bkchr · 2022-10-07T15:21:11Z

+pub struct MigController;
+pub struct RootMigController;
+
+const KEY_ROOT_MIG_CONTROLLER: [u8; 32] = [
+	82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68,
+	232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73,
+];
+
+const KEY_MIG_CONTROLLER: [u8; 32] = [
+	82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68,
+	232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73,
+];
+
+impl SortedMembers<AccountId> for RootMigController {
+	fn sorted_members() -> Vec<AccountId> {
+		// hardcoded key of controller for manual migration
+		vec![KEY_ROOT_MIG_CONTROLLER.into()]
+	}
+}
+
+impl SortedMembers<AccountId> for MigController {
+	fn sorted_members() -> Vec<AccountId> {
+		// hardcoded key of controller for manual migration
+		vec![KEY_MIG_CONTROLLER.into()]
+	}
+}


Suggested change

pub struct MigController;

pub struct RootMigController;

const KEY_ROOT_MIG_CONTROLLER: [u8; 32] = [

82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68,

232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73,

];

const KEY_MIG_CONTROLLER: [u8; 32] = [

82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68,

232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73,

];

impl SortedMembers<AccountId> for RootMigController {

fn sorted_members() -> Vec<AccountId> {

// hardcoded key of controller for manual migration

vec![KEY_ROOT_MIG_CONTROLLER.into()]

}

}

impl SortedMembers<AccountId> for MigController {

fn sorted_members() -> Vec<AccountId> {

// hardcoded key of controller for manual migration

vec![KEY_MIG_CONTROLLER.into()]

}

}

frame_support::ord_parameter_types! {

pub const KEY_MIG_CONTROLLER = hex!("INSERT_HEX_STRING");

pub const KEY_ROOT_MIG_CONTROLLER = hex!("INSERT_HEX_STRING");

}

const KEY_ROOT_MIG_CONTROLLER: [u8; 32] = [

82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68,

232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73,

];

const KEY_MIG_CONTROLLER: [u8; 32] = [

82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68,

232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73,

];

impl SortedMembers<AccountId> for RootMigController {

fn sorted_members() -> Vec<AccountId> {

// hardcoded key of controller for manual migration

vec![KEY_ROOT_MIG_CONTROLLER.into()]

}

}

impl SortedMembers<AccountId> for MigController {

fn sorted_members() -> Vec<AccountId> {

// hardcoded key of controller for manual migration

vec![KEY_MIG_CONTROLLER.into()]

}

}

bkchr · 2022-10-07T15:29:58Z

 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 8,
-	state_version: 0,
+	state_version: 1,


We should feature gate this for now.

As the GCP is still deploying the chain on Rococo for testing.

bkchr · 2022-10-07T15:30:07Z

 		Assets: pallet_assets::{Pallet, Call, Storage, Event<T>} = 50,
 		Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>} = 51,
+
+		StateTrieMigration: pallet_state_trie_migration = 52,


Should also be feature gated.

bkchr · 2022-10-10T07:15:39Z

+#[test]
+fn ensure_key_ss58() {
+	use frame_support::traits::SortedMembers;
+	use sp_core::crypto::Ss58Codec;
+	let acc =
+		AccountId::from_ss58check("5DwBmEFPXRESyEam5SsQF1zbWSCn2kCjyLW51hJHXe9vW4xs").unwrap();
+	//panic!("{:x?}", acc);
+	assert_eq!(acc, MigController::sorted_members()[0]);
+	let acc =
+		AccountId::from_ss58check("5DwBmEFPXRESyEam5SsQF1zbWSCn2kCjyLW51hJHXe9vW4xs").unwrap();
+	assert_eq!(acc, RootMigController::sorted_members()[0]);
+	//panic!("{:x?}", acc);
+}


Do we need this?

I use it to ensure the controller account is correct (from the ss58 one).
I did check again why I did it in the first place, turns out Ss58Codec is behind 'full_crypto' feature and 'from_ss58check' is behind std.
I don't really see why from_ss58check could not be no_std, just would be a bit more work to switch it.

bkchr · 2022-10-10T07:16:02Z

+	type ControlOrigin = frame_system::EnsureSignedBy<RootMigController, AccountId>;
+	// specific account for the migration, can trigger the signed migrations.
+	type SignedFilter = frame_system::EnsureSignedBy<MigController, AccountId>;
+	//type SignedFilter = frame_system::EnsureSigned<Self::AccountId>;


Suggested change

//type SignedFilter = frame_system::EnsureSigned<Self::AccountId>;

kianenigma

Not sure if/why we need a new feature flag.

kianenigma

please merge #1424 (review) as well before starting the devops process.

cheme · 2022-11-07T09:11:21Z

bot merge

paritytech-processbot · 2022-11-07T09:11:30Z

Error: Statuses failed for 48642b3

cheme · 2022-11-07T09:15:51Z

bot merge

paritytech-processbot · 2022-11-07T09:15:59Z

Waiting for commit status.

paritytech-processbot · 2022-11-07T09:21:02Z

Merge cancelled due to error. Error: Statuses failed for 180ab19

cheme · 2022-11-07T10:41:59Z

bot merge

paritytech-processbot · 2022-11-07T10:42:07Z

Waiting for commit status.

cheme added 4 commits July 4, 2022 15:11

init, using polkadot master

d07d8ec

version update

856aa86

weights copy pasted from substrate

2a63c7c

Merge branch 'state-mig'

9a3f025

paritytech-ci requested review from a team October 7, 2022 14:24

cheme commented Oct 7, 2022

View reviewed changes

Comment thread parachains/runtimes/assets/statemine/src/lib.rs Outdated

bkchr reviewed Oct 7, 2022

View reviewed changes

paritytech-ci requested review from a team October 7, 2022 15:30

feature gate migration

1c467fe

bkchr approved these changes Oct 10, 2022

View reviewed changes

paritytech-ci requested a review from a team October 10, 2022 07:30

joepetrowski reviewed Oct 10, 2022

View reviewed changes

Comment thread parachains/runtimes/assets/statemine/src/lib.rs Outdated

joepetrowski reviewed Oct 10, 2022

View reviewed changes

Comment thread parachains/runtimes/assets/statemine/src/lib.rs

changes from reviews

5df8b9b

joepetrowski requested a review from kianenigma October 10, 2022 11:31

kianenigma reviewed Oct 11, 2022

View reviewed changes

Comment thread parachains/runtimes/assets/statemine/Cargo.toml Outdated

kianenigma suggested changes Oct 11, 2022

View reviewed changes

paritytech-ci requested a review from a team October 11, 2022 08:18

cheme added 2 commits October 14, 2022 14:16

Change controller addresses.

ed72c46

Merge branch 'master' into statemine-mig

48642b3

kianenigma approved these changes Nov 2, 2022

View reviewed changes

Merge branch 'master' into statemine-mig

180ab19

cheme added 2 commits November 7, 2022 11:37

fix

895521f

rename feature to state-trie-version-1

1d48ad4

paritytech-processbot Bot merged commit 670945d into paritytech:master Nov 7, 2022

Conversation

cheme commented Oct 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

bkchr Oct 7, 2022

Choose a reason for hiding this comment

Uh oh!

bkchr Oct 7, 2022

Choose a reason for hiding this comment

Uh oh!

bkchr Oct 7, 2022

Choose a reason for hiding this comment

Uh oh!

bkchr Oct 10, 2022

Choose a reason for hiding this comment

Uh oh!

cheme Oct 10, 2022

Choose a reason for hiding this comment

Uh oh!

bkchr Oct 10, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kianenigma left a comment

Choose a reason for hiding this comment

Uh oh!

kianenigma left a comment

Choose a reason for hiding this comment

Uh oh!

cheme commented Nov 7, 2022

Uh oh!

paritytech-processbot Bot commented Nov 7, 2022

Uh oh!

cheme commented Nov 7, 2022

Uh oh!

paritytech-processbot Bot commented Nov 7, 2022

Uh oh!

paritytech-processbot Bot commented Nov 7, 2022

Uh oh!

cheme commented Nov 7, 2022

Uh oh!

paritytech-processbot Bot commented Nov 7, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

cheme commented Oct 7, 2022 •

edited

Loading